Merge "Refactor PagedTileLayout to not overflow screen"