Merge "icnss: Synchronize idle shutdown and restart"