Merge "Misc fixes for IME adjust" into nyc-dev