Merge "Android 5.0 changes to IME switching" into lmp-dev
automerge: d664dc9

* commit 'd664dc93f47e32df865384718055b200585e0e88':
  Android 5.0 changes to IME switching