Merge "Don't clear the password field when window focus changes."