Immediately shut down if there's nothing to do.
Merge bug26454
stable to default