Merge "Have both NAVIGATION_HINT_IME{,_SWITCHER}_SHOWN"