Merge "Fix wakelock"