Merge "Handle task visibility change to show the surface" into udc-dev