Merge "Clean up ENABLE_KEYBOARD_TRANSITION_SYNC flag." into main