Customization menu: improve summaries
[1/2] Settings: Fix pimp up ActiveDisplay

Thanks to @micku7zu
[2/2] Settings: added config for menu unlock
New setting under "Debug settings" that enables the development shortcut

Resolve Conflicts:
	src/com/android/settings/DevelopmentSettings.java
DevelopmentSettings: Fix up save Advanced reboot state

This introduced on http://review.cyanogenmod.org/#/c/54859/

Change-Id: Ic4e2e5c5c3e4bd7649b6d715462c1bb63484a692
Halo: Add master switch to disable Halo (2/2)

Thanks to @scotthartbti and @Der-Schubi
Quiet Hours: Clean up and consolidate code (2/2)

Thanks to @invisiblek from CM and @kufikugel from Slim
Quiet Hours Ringer (3/3)

Change-Id: Ia4b167654867425b8d7cac952de094b16002da02