Merge "Make WakeLock handling thread safe" into main