Merge "Add FaceManager.LockoutResetCallback from a bgThread" into main