Merge "Add z-order regions for task child layers" into tm-qpr-dev