Merge "Improve handling of TV PiPs bigger than movement bounds" into tm-dev