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