Merge "Deprecate the dvr_extra_resources config switch."