Merge commit '0696768374567afa4fe58c2ef0af948b72e83e5d' * commit '0696768374567afa4fe58c2ef0af948b72e83e5d': Audio/video sync during recording (second part)
Merge commit '0696768374567afa4fe58c2ef0af948b72e83e5d' * commit '0696768374567afa4fe58c2ef0af948b72e83e5d': Audio/video sync during recording (second part)