Merge "SF: Clean up flush transaction queues"