Merge "Make sure IME focus is synced to View focus" into nyc-dev am: b7efddfc41 am: 15946bd93c am: 04e7bc8ea4 am: 7dd5f81c42
am: deb91b89f9

Change-Id: I3d0c5ee63fc1101f2d39b6c10cacb36df3a65a03