Merge "Call isUserUnlockingOrUnlocked with cleared identity" into nyc-dev