Merge "Avoid sending top-resumed gain/loss to client if resume deferred" into main