Merge "Add a feature flag for smartspace dismiss option." into sc-dev