Merge "More media mainline module code separation"