Merge "Smartspace in wrong position" into sc-dev