Merge "Only show IME in navigation bar when it should"