Settings: Move Navigation buttons out of interface.

    http://imgur.com/iQi5xMg
    PS15: Move expanded desktop options to display.
    PS16: More cleanup.
    PS17: Remove whitespace.

Change-Id: I923d011cfa72a7c3fe26838032d00aaddf15a664
Settings: Fix lockscreen security strings

Change-Id: I9e35108cc7a0d65c80cc87ad9502c9ffdc29847a
Settings: Remove V+ pref if V+ isn't present

Change-Id: Ia202d00ebee95e99018e7b04ef284de0bf3f1e1c
Merge "Settings: Move Navigation buttons out of interface." into cm-11.0
Settings: Remove owner info from lockscreen options.

Change-Id: I5c1133e4aabe0c0c53472096bd8e7099690715c5
Merge "Settings: Remove V+ pref if V+ isn't present" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0-sgt7

Conflicts:
	res/xml/notification_drawer.xml
	res/xml/system_ui_settings.xml