Merge "Set default value of 'dvr_extra_resources' option to False"