Merge upstream changes and add IME Switcher Notification

See my comment on your Settings repo...hope this saves you some time!