Merge "Revert "Run fpDetect instead of authenticate if keyguard is dismissible"" into main