Merge "Do not offset PiP when auto-enter-pip is ongoing" into tm-dev