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

Change-Id: I8699647760d6be7a7e258a0b4aec64294dce5d63