Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am: e1e0db8ca9
am: 5323b2d4cd

Change-Id: I659c818c815b46d666986b1a1224fd4d4f57e56e