Merge "Create window decors for leaf tasks & skip non-leafs" into tm-qpr-dev