Recover channel shutdown hooks
Consistency
Merge bug26232.
stable to default