Merge "SmartspaceManager initial implementation" into sc-dev