Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev