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