* Migrate v7 Grid tests. 7th round. Fixes #8419 * Fix test failures * Minor improvements * Merge remote-tracking branch 'github/master' into 8436-grid-test-migration * Merge remote-tracking branch 'github/master' into 8436-grid-test-migration * Update screenshot reference