Revert "Unregister listeners and reset wake lock"

This reverts commit fe107a1621b98f8e9caa47b1e4e7ecbee00a2f88.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Id092c473a8300e014ccd4d941afa4afcdbbf48bc
2 files changed