Merge "Make sure IME focus is synced to View focus" into nyc-dev
am: b7efddfc41

Change-Id: I6a5c98b87dffb4cd3db5e434743b463142a50e1d