Merge "DO NOT MERGE Update current user for passwordEntry and restart input on user switch." into rvc-qpr-dev