Locking active screenlocker should end grace time

For example, when the screenlocker activates on idle (but is not
configured to require a password) and then powerdevil suspends the
computer and is configured to lock screen on resume.

Matches behaviour of the old screensaver code.

REVIEW: 109608