Merge "Allow CommandQueue to have multiple callbacks"