Merge "Remove decoration layers from hierarchy on release" into tm-qpr-dev