Merge "Enables Enhanced Smartspace by default." into sc-v2-dev