Merge "Set navbuttons_view width instead of height in landscape mode" into main