Fix lock on suspend

These changes fix some regressions which introduced in logind and upower-1.0 support patches.