Bug 1061804 - Browser OpVar Customization Fixes
Merge pull request #23656 from qdot/1061804-browser-opvar-followup

Bug 1061804 - Browser OpVar Customization Fixes