Revert "Suspend Actions & Wakelock Blocker (1/2)"

This reverts commit a60107f8793ec7b6b68ae0ae5ce69abc5225a473.
Fix possible NPE