Merge "[Mag] Keyboard shortcut info shown when physical keyboard present" into main