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

Change-Id: Ie501b38fe561a37ab60069fae56b7b0f41f9016e