Merge "Make ISmartspaceManager non-blocking" into tm-dev