Merge "Make sure don't adjust IME when docked left-right" into nyc-dev