Merge "Update task surface visibility with reparent for pip" into main