Merge "Fix crash on PagedTileLayout"