Merge "In order to recover from video lagging behind audio, drop avc frames"