Merge pull request #20336 from JoeHowse:refactor-cl_image-float16-conversions