Merge "DO NOT MERGE Remove focus on PasswordTextView" into rvc-qpr-dev