Merge "Add null colorspace protection" into main