Merge "Allow SFPS auth to continue running after face auth" into main