Merge "Revert "Ensure that CommandQueue is a singleton.""