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

Change-Id: I3f0af84d3162d78734e72f7869acff596b25803d