Merge "Fixed the wrong timestamps issue about camera recording"