Restore lock before unlock

It was removed early on due to bringing in lockscreen notifications for one reason
or another and some how it was never restored til now....

Credit @kufikugel

Change-Id: Iaa481db41f69cb704bb9cc71ab73bdc19d93fd9e