Merge "Save extras when delaying dial due to ECBM"