Merge "Make CommandQueue optional."