And readd the lockscreen commits again... working this time.

Thanks slim devs.

Change-Id: Ibc66b5dc3e961adae23b3c3cc5f472e7a0ebb8ab
Signed-off-by: scott <scott@ubuntu.com>