Merge "Move CommandQueue.addCallback later" into main