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

Change-Id: I7f07cbd49c82747b8387f5ce132e397cd2eee491