Merge "Fix issue with aspect ratio not applying correctly when PIP is expanded" into oc-dev
am: 9c1b222fc1

Change-Id: I66e6b3e1b12af493ed7533d67aa013ccee87a11a