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