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

Change-Id: I3394e8f297577b80e439945425356e8e7edac227