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

Change-Id: Ife88f1db852d49c31ddbbd5a6ebbe55f4ae02f51