Merge "Credential storage: check lock quality for right user" into nyc-dev