Merge "Make sure IME focus is synced to View focus" into nyc-mr1-dev am: 04828df84e am: 54f4570487
am: 906b834181

Change-Id: I6ea81eaf0e32c04f28c4439f77d300d89faad78e