Merge "Add visibility rule for packages/modules/Media"