Merge "Fix a race to detemine IME switcher visibilityde" into nyc-mr1-dev