Merge "Null check color_space_ptr in draw functor v2" into sc-dev