Merge "gs_watchdogd: add shutdown critical option"