Merge "Revert "Do not enter pip during transient launch."" into udc-qpr-dev