Merge "Maintain remember me state on password change"