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