Merge "Revert "Revert "Move touch handling out of NavigationBarView.""" into tm-dev