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: eaf73664
* commit 'eaf73664':
Change-Id: I5c28aa5ea1aea15a0f355670c5ce95f8e8f98c6e