Merge "Optimize tiling management Bug #7186819" into jb-mr1-dev