Merge "Call mergeWithNextTransaction in registerCallbacksForSync" into main