Merge "Fix race condition in WakeLocks."