Merge remote-tracking branch 'github/cm-12.0' into cm12mod

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Change-Id: Ia6c2183b854aac9f345fe4f98d1dfde886b64bd4
Settings: add volume rocker control (wake up) (2/2)

Change-Id: I4ddf4a792f3512716bb876ded964ae37f6076e83

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java