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

Change-Id: I79f4308a0f41ce510b63b439772b882110440d0f