Merge "Increase callback waiting time to fix test flakiness." into main