Merge "Ensure that CommandQueue is a singleton."