Merge "Clear flags when a rollback is committed."