Merge "Do not change layering for non live tile tasks rendering" into tm-qpr-dev