Merge changes I9a138ba9,Ied62beb0

* changes:
  Test PiP on TV with different aspect ratios
  Always run TV PiP tests with 0 rotation