Merge "Check for page indicator mismatch in PagedTileLayout" into main