Merge "DO NOT MERGE: Redesign base layouts" into qt-qpr1-dev