Merge "Media - Remove before adding for config changes"