Merge "Revert "Update fingerprint listening state after faceAuth cb is sent"" into main