Merge "Fix issue where expectedListenerUpdate is not stable on test runs." into tm-dev