Merge "Use withLayer for live tile layering" into tm-qpr-dev