Merge "Audio/video sync during recording (second part)" into gingerbread