Merge "Attempt auto-enter-pip only on user-leaving" into tm-dev