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

Change-Id: I8cb332d0bbd356f4c72e5d0cc3f6ba20a811fae7