Merge "Remove Dep.get(CommandQueue.class) from NavBarView" into tm-dev