Merge "Only add commit callback when using sync transaction"