Merge "icnss: Defer modem graceful shutdown until probe complete"