Merge "Use task layer constants for window decor z-order" into tm-qpr-dev