Merge "DO NOT MERGE Fixes clipping on PagedTileLayout" into pi-dev