Merge "Added a category for lockscreen settings." into oc-dr1-dev