Suspend Actions & Wakelock Blocker (2/2)

Change-Id: I325cc96ba5fbfdcb6217a4007daa1a905ac1a219

Conflicts:
	AndroidManifest.xml
	res/values/cr_strings.xml
	res/xml/general_settings.xml