Merge "Address feedback on MediaTimestamp, SubtitleData and TimeMetadata"