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

Change-Id: I9ff723c09e251314198dd2d1514d812fb97dca35