am 36d13e6a: am 491fa057: am d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev

* commit '36d13e6ae8ccef31fde01118fd457f13f10d288f':
  Android 5.0 changes to IME switching