Revert "Revert "Use previous commit for reboot and shutdown dialogs""

This reverts commit 92bfbf86116009ec902703a533324939eb20ee49.