Bug 1036691 - Fix settings includes for browser shims
Merge pull request #23781 from qdot/1036691-fix-browser

Bug 1036691 - Fix settings includes for browser shims