Merge "Fix some visibility issues with tasks & task overlays" into tm-qpr-dev