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