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

Change-Id: I58590da5e275f3730133c280261d7aad7615af5b