Merge "Smartspace location fix" into sc-dev