Merge "Spin off smartspace behavior into SmartspaceController" into sc-dev