Merge "Change the dither texture's swizzling" into jb-mr2-dev