Merge "Fix ime switcher not showing for 3-button nav" into tm-qpr-dev