Merge "Fix keyboard shortcut display layout"