Merge "Move #mHardwareKeyboardShortcutController to UserData" into main