Merge "Fix pageMargin in PagedTileLayout" into sc-dev