Merge "Fix shutdown delay"