Merge "To skip face enrollment for PS unlock setup based on intent extra" into main