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