Merge "Fix under-locked wakelock"