Merge "Fix keyboard shortcuts for non-US keyboards" into stable-2.11