Merge "Export combined biometrics settings page" into main