Merge "Update logic to detect DVR in rescheduling test"