Merge "Remove unused code - MediaSourceSplitter"