Merge "Enable smartspace" into sc-dev