GitLab

* Convert channel order to BGR for the watermark encoder. Convert the watermarked BGR images back to RGB. Fixes #6292

* Revert channel order before stacking images to overcome limitations that negative strides are currently not supported

---------
Co-authored-by: Sayak Paul <spsayakpaul@gmail.com>