Merge "Respect shouldShowInInputMethodPicker again" into main