Merge "Clean-up BottomNavigationMenuView#onMeasure and other style fixes."