Merge "Deprecate legacy and unused DVR API" into pi-dev