Merge "Update Biometric Prompt for private space" into main