Merge "Keyboard Shortcuts Helper: Use App name for default group"