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

Change-Id: Icbef365e73d789419479143d9ce63a2476682b8e