Merge "Removes Smartspace Feedback flag." into sc-v2-dev