Merge pull request #22848 from braders/extension-manager-notices