Button height fix
Merge tag '37.1' into develop
Reduced navigation bar height on tablet/mobile