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