Merge "Revert "Move PiP when it occludes a keep clear area with naive a..."" into tm-dev