Merge "Call InvalidationCallback#onCompleted when client is cancelled" into main