Merge "Fix base layout toolbar taking up whole screen in portrait" into qt-car-dev