Merge "Fix flaky key event expectation in KeyboardQuickSwitch" into main