Bug 1031029 - Unlock the lockscreen only if enabled
Merge pull request #21365 from mschwart/bug1031029

Bug 1031029 - Unlock the lockscreen only if enabled