Merge "Media.effect: Remove redundant package info" into nyc-dev