Merge "add system_server to bug map" into main