Merge "DO NOT MERGE Remove toolbar layout from -port folder" into qt-car-dev