Switch over to Slim's lockscreen stuff.

Change-Id: Id35913c53ade7f7c6c67ec156c1526820c599d1d
Merge "Switch over to Slim's lockscreen stuff." into kk