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