Merge "Restore password metrics after a credential-less unlock" into rvc-dev