Merge "Show task background surface" into tm-qpr-dev