Merge "Attempt to fix KeyboardVisibilityControlTest flakiness" into sc-dev