BZ-12331: Changes to set the branding setting in the estimate