Merge "In Private space settings when no face support show only fingerprint unlock" into main