Merge "Fix a regression in SHOW_IME_WITH_HARD_KEYBOARD handling." into nyc-dev