Merge "Revert "Changes ENABLE_SMARTSPACE_ENHANCED to be a DeviceFlag."" into sc-dev