Merge in develop

app/dawn-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx

@@ -29,7 +29,11 @@ const WelcomeView = (props) => {
 
 	const gateSetupStep = (e) => {
 		if (getUserResolved) {
-			setSetupStep({ setup_step: WELCOME, origin: WELCOME });
+			setSetupStep({
+				setup_step: WELCOME,
+				dawn_setup_number: SETUP_STARTED,
+				origin: ONBOARDING
+			});
 		} else {
 			e.preventDefault();
 		}

app/dawn-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx

@@ -203,6 +203,9 @@ class BlockSettingsView extends Component {
 		const {
 			enable_ad_block, kindsOfTrackers, enable_anti_tracking, enable_smart_block
 		} = this.state;
+
+		const recommendedChoicesActive = this.recommendedChoicesActive();
+
 		return (
 			<Fragment>
 				<div className="BlockSettingsView__relativeContainer">