Wakelock blocker (2/2) - Squashed

From @maxwen 's RC to AICS's Settings

PS2: Fix no activity error
PS3: Fixed NPE

Change-Id: Ie319d6db8032c42238b3576828c2e0970a52812d