Merge "Fix issue with TV PIP clobbering resize on orientation change." into oc-dev am: 921078ab31
am: 3857f8b5c4

Change-Id: Ic7153eecf1792d827385115fd03d73f94efe5465