Merge "Fix cutoff g in "Restarting"/"Shutting down" messages." into pi-dev