Merge "init: add timers around sync() during shutdown"