Merge "Merge "Fix: Cannot control ime_switcher and menu after resetting." into...
Merge "Merge "Fix: Cannot control ime_switcher and menu after resetting." into nyc-dev am: a423e253 am: f92b74f8" into nyc-mr1-dev-plus-aosp
am: 26fd0e09
* commit '26fd0e09':
Change-Id: Ie5bb107e3def697c1cb10381b46223b888426bbe