Merge "Face and fingerprint unlock strings for private space" into main