Merge "Fix rendering artifacts on tiled renderers Bug #7275145" into jb-mr1-dev