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

Change-Id: Id9b753762b528637e75ea3b863fd2a2a45fa0df3