Merge "Don't store change_queue in QueueItem"