Settings: allow home button to wake device [2/2]

Change-Id: I5c887422636f8bc51cb324339b3cdcac7af54400

Conflicts:
	res/values/cm_strings.xml
Added extra description

Change-Id: I92551ba5a5eb3963a7b890c1816765f6d9ebdef4