Merge "Fix: Cannot control ime_switcher and menu after resetting." into nyc-dev
am: a423e2535b

* commit 'a423e2535b2d79849465db1a24aefa6779cc695b':
  Fix: Cannot control ime_switcher and menu after resetting.

Change-Id: I5d50dd2cb84687540a556922ad4000815c8e3073