Merge "Update the IME nav UI when gesture navigation mode changes"