Real fix to the battery drain wakelock issue