Merge "Add IME Switcher icon to Navigation Bar"