Merge "Distinguish user-requested shutdown from power-related ones"