[2/2] Settings: Wakelock Blocker

Change-Id: Ic4dc068a9e8f6d1b625d5d13cef404dab3711064

Conflicts:
	res/values/cr_strings.xml
	res/xml/settings_headers.xml
Fix Settings and layout
Merge branch 'temp' into kk4.4