Merge "Remove last call to Dep.get from NavigationBarView" into tm-dev