Merge "Decouple task visibility from surface life" into udc-qpr-dev