Merge "Skip depth and scrim if freeform tasks are visible" into tm-qpr-dev