Merge "Don't reset the keystore during password change"