Merge "Remove 'dvr_extra_resources' option"