Merge "Add tempest tests for DVR router state management"