Merge "Reduce effect on PipMenuActivity during animation" into oc-dev