Merge "media sync: forcefully limit correction by VideoFrameScheduler." into pi-dev