[1/2] OmniGears: Lockscreen Settings

Settings: https://gerrit.omnirom.org/#/c/5785/

Change-Id: I6a3c584641a7325ada2b07eaf3c827e755558cdd
Revert "[1/2] OmniGears: Lockscreen Settings"

This reverts commit 9d108f7cab1e72d506367450320109055940d19c.
Merge branch 'head' into kitkat