Merge "Remove Dependency#get calls from NavigationBarView" into tm-dev