Update power off to kill via pid
Merge branch 'fix-power-off-with-pid'