Merge "Cleanup qs shortcut flag in OneHandedSettingsUtils" into main