Merge "Make sure IME focus is synced to View focus" into nyc-dev am: b7efddfc am: 15946bd9 am: 04e7bc8e am: 7dd5f81c Change-Id: Id9b753762b528637e75ea3b863fd2a2a45fa0df3