Merge "Revert^4 "Enable smartspace"" into sc-dev