Merge "Adds a flag for Smartspace feedback." into sc-dev