Merge "Ensure transaction commit callbacks are called at most once." into main