Merge "Make sure IME focus is synced to View focus" into nyc-mr1-dev