Merge "[Physical Keyboard Setting] Update layout for one pane land screen" into main