Merge "Abort a pending failed pip-enter transition" into udc-qpr-dev