Merge "Smartspace + shelf - Remove space" into sc-dev