Merge "Fix regression with the closing task leash visibility" into udc-qpr-dev