Merge "Extending time out to reduce test flakiness" into main