Merge "Fix number of pages in PagedTileLayout" into qt-qpr1-dev