Merge "Let unlocked profile verifyCredential under unified lock" into oc-dev