Merge "Avoid doNotifyQueueEmpty() race conditions for Redis"