Merge "Remove unused use_protobuf3 flag" into main