Merge "Check if the given user is unlocked when unlock by token" into pi-dev