Merge "Fix TileLayout#onMeasure" into qt-dev am: 23feab4338
am: efccc88eca

Change-Id: I002136365e8d8050d1afc317b55233f982c3c89a