[ros-diffs] [gvg] 15850: Re-apply fix to dib16bpp and fix the root cause