Merge "Recognize numeric PIN in resetPasswordWithToken()" into sc-dev