Merge "Provide vsync id for PiP animation"