Merge "Fix a race condition on ReportHandler::mBatch" into rvc-dev