Merge "Remove driver stop delay config as it is no longer used"