Settings revamp Part 1

Contains:
Move Lockscreennotifications under /Display
Reconstruct Display Settings

Change-Id: I8124c457153ae93ada174e6cdcb01497b56f9f75