[2/2] Settings: Wakelock Blocker

Change-Id: Ic4dc068a9e8f6d1b625d5d13cef404dab3711064

Conflicts:
	res/values/cr_strings.xml

Conflicts:
	res/values/cr_strings.xml

Conflicts:
	res/values/axxion_strings.xml

Conflicts:
	res/values/axxion_strings.xml
[2/2] Settings: Volume panel timeout

Change-Id: If200173d6faf37a93638b4802bdfed4e9a261d44

Conflicts:
	res/values/cr_strings.xml

Conflicts:
	res/values/axxion_strings.xml

Conflicts:
	res/values/axxion_strings.xml