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