Merge "Do not attempt auto-enter-pip if there is no valid leash" into tm-qpr-dev