Merge "Store correct time stamps in recorded mp4 files"