Merge "Moving NavigationMode to display controller" into tm-dev