Merge "Revert "Avoid doNotifyQueueEmpty() race conditions for Redis""