Merge "Fix issue with TV PIP clobbering resize on orientation change." into oc-dev