Make queue flushing work with deferred explicit change tracking policy