Merge "Always defer the log publish() in recordUpload2"