Suspend Actions & Wakelock Blocker (2/2)

Change-Id: I3167307df0adfb393f1cb4bd81496bc5c71a7535

Conflicts:
	AndroidManifest.xml