Ensure we lock the screen before we hibernate or suspend if the user has the...

Ensure we lock the screen before we hibernate or suspend if the user has the screensaver lock enabled

This fixes a regression as gnome-power-manager used to do this for us automatically.