Merge "media: make MediaTimestamp an immutable class"