Merge "Fix KeyboardShortcuts show"