Merge conflicted changes from main into develop

[nfmohit]

Summary

Addresses issue:

Relevant technical choices

This PR addresses an issue where we try to merge main into develop, but some conflicts arise. This is due to the changes the follow-up PR (merged directly into main before the release 1.90.0) for #6201 not being available in develop.

This PR aims to merge main into develop, while fixing the conflicts and including the changes from the follow-up PR for #6201.

PR Author Checklist

• My code is tested and passes existing unit tests.
• My code has an appropriate set of unit tests which all pass.
• My code is backward-compatible with WordPress 5.2 and PHP 5.6.
• My code follows the WordPress coding standards.
• My code has proper inline documentation.
• I have added a QA Brief on the issue linked above.
• I have signed the Contributor License Agreement (see https://cla.developers.google.com/).

---

Do not alter or remove anything below. The following sections will be managed by moderators only.

Code Reviewer Checklist

• Run the code.
• Ensure the acceptance criteria are satisfied.
• Reassess the implementation with the IB.
• Ensure no unrelated changes are included.
• Ensure CI checks pass.
• Check Storybook where applicable.
• Ensure there is a QA Brief.

Merge Reviewer Checklist

• Ensure the PR has the correct target branch.
• Double-check that the PR is okay to be merged.
• Ensure the corresponding issue has a ZenHub release assigned.
• Add a changelog message to the issue.

[github-actions]

Size Change: +4 B (0%)

Total Size: 1.21 MB

Filename	Size	Change
./dist/assets/js/googlesitekit-adminbar-********************.js	35.4 kB	+3 B (0%)
./dist/assets/js/googlesitekit-entity-dashboard-********************.js	63.6 kB	+1 B (0%)
./dist/assets/js/googlesitekit-main-dashboard-********************.js	69 kB	+1 B (0%)
./dist/assets/js/googlesitekit-modules-analytics-********************.js	70.5 kB	-2 B (0%)
./dist/assets/js/googlesitekit-modules-pagespeed-insights-********************.js	21.2 kB	-1 B (0%)
./dist/assets/js/googlesitekit-widgets-********************.js	15.6 kB	+3 B (0%)
./dist/assets/js/googlesitekit-wp-dashboard-********************.js	59 kB	-1 B (0%)

ℹ️ View Unchanged

Filename	Size
./dist/assets/css/googlesitekit-admin-css-********************.min.css	47.4 kB
./dist/assets/css/googlesitekit-adminbar-css-********************.min.css	11 kB
./dist/assets/css/googlesitekit-wp-dashboard-css-********************.min.css	7.13 kB
./dist/assets/js/30-********************.js	2.8 kB
./dist/assets/js/31-********************.js	2.28 kB
./dist/assets/js/32-********************.js	3.72 kB
./dist/assets/js/33-********************.js	3.12 kB
./dist/assets/js/analytics-advanced-tracking-********************.js	769 B
./dist/assets/js/googlesitekit-activation-********************.js	26.8 kB
./dist/assets/js/googlesitekit-api-********************.js	9.44 kB
./dist/assets/js/googlesitekit-base-********************.js	1.13 kB
./dist/assets/js/googlesitekit-components-gm2-********************.js	5.82 kB
./dist/assets/js/googlesitekit-components-gm3-********************.js	421 B
./dist/assets/js/googlesitekit-data-********************.js	2.12 kB
./dist/assets/js/googlesitekit-datastore-forms-********************.js	9.12 kB
./dist/assets/js/googlesitekit-datastore-location-********************.js	2.08 kB
./dist/assets/js/googlesitekit-datastore-site-********************.js	15.3 kB
./dist/assets/js/googlesitekit-datastore-ui-********************.js	9.23 kB
./dist/assets/js/googlesitekit-datastore-user-********************.js	21.7 kB
./dist/assets/js/googlesitekit-i18n-********************.js	3.92 kB
./dist/assets/js/googlesitekit-modules-adsense-********************.js	69.6 kB
./dist/assets/js/googlesitekit-modules-analytics-4-********************.js	19.4 kB
./dist/assets/js/googlesitekit-modules-********************.js	20.2 kB
./dist/assets/js/googlesitekit-modules-optimize-********************.js	18.8 kB
./dist/assets/js/googlesitekit-modules-search-console-********************.js	38.4 kB
./dist/assets/js/googlesitekit-modules-tagmanager-********************.js	31.8 kB
./dist/assets/js/googlesitekit-polyfills-********************.js	379 B
./dist/assets/js/googlesitekit-settings-********************.js	50.1 kB
./dist/assets/js/googlesitekit-splash-********************.js	68.6 kB
./dist/assets/js/googlesitekit-user-input-********************.js	43.2 kB
./dist/assets/js/googlesitekit-vendor-********************.js	329 kB
./dist/assets/js/runtime-********************.js	1.26 kB

_{compressed-size-action}

[nfmohit]

Note: The VRT check failure is most likely related to #6324. I’ve checked the report and there are no relevant scenarios failing.

[aaemnnosttv]

Great, thanks @nfmohit 👍