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

Change-Id: I9c9e072835eadf330850535127d9463aa4f04637