Merge "Fix overview grid scroll problem" into sc-dev