Merge "Adjustments to PIP position while flinging" into oc-dr1-dev