Merge "Exclude MediaComponents from the build." into pi-dev