Merge "Add mandatory biometric prompt to platform surfaces (3/N)" into main