Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev