Merge "Handle page offset for grid overview" into sc-dev