Merge "Fix unexpected IME switcher dialog hidden" into tm-dev