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

Change-Id: Ia8727393cdf93e857d26ba75d33ebef0625884de