Merge "Initialize Task surface as invisible" into tm-qpr-dev