Merge "Fix focus cleared and password keyboard shown during IME switching" into rvc-dev am: ec956ce538 am: cd2136e3c9 am: 2a296fd66b

Change-Id: Ib4a8d1ce352a7eb038a51b777aef6f3942fc7d95