Merge "Cleanup backup_service_security_log_event_enabled" into main