Merge "Lock down IME switcher notification handling" into oc-mr1-dev