Merge "Fix 2373088: Cleanup and minor fixes to PasswordKeyboard*."