Suspend Actions & Wakelock Blocker (2/3)

Change-Id: I3634e526edc1dcb26058f34d6927578756a65e84

Conflicts:

	AndroidManifest.xml
	res/values/cm_strings.xml
	res/xml/settings_headers.xml