Make replaying after waiting for item listing more robust.

The previous approach worked for asynchronous resources but failed if
changeProcessed() is called immediately.
(cherry picked from commit b4192e536172cf116d83ed0a222e702a0a94ba8c)