[automerger skipped] Merge "DO NOT MERGE: Redesign base layouts" into qt-qpr1-dev am: 5cc9ea3c7a -s ours

am skip reason: subject contains skip directive

Change-Id: Ib1705cafe547b73f11c711e4319e1b985d9f0d2d