Merge "Fix number of pages in PagedTileLayout" into qt-qpr1-dev am: 41aaa99f9b
am: a5206a73b5

Change-Id: Ice3d8bde73d209f95b7ddb62dde7d769c5d67dd6