Cancel display state restore if devicelock state changes

When usb cable is plugged in and device lock code entered, the display
will blank and possibly re-apply the device lock unless the user does
swipe to show homescreen almost immediately. Since successfully entering
the device lock code is clear indication that user wants to do something
with the device, normal blanking timeouts should be applied instead.

Cancel state restoration if device lock status changes during exceptional
display on state.

[mce] Cancel display state restore if devicelock state changes. Fixes JB#22743
Allow OBS build without explicit version tag

MCE has version information recorded in several files. To keep these
in sync, there is a script that will cause rpm builds to fail unless
all of the places have the same version.

While this is good for making sure releases do not end up using out
of sync version numbers, it also makes it impossible to build mce
in OBS without creating explicit version tag.

Relax the version checking for spec file so that versions constructed
from matching version + extra git hash identification are also accepted.
Merge pull request #216 from spiiroin/cancel_restore_on_unlock

Cancel display state restore if devicelock state changes