Merge "Move media.* properties to media_config_prop"