Merge "Simplify nav mode change in InputMethodServiceTest" into main