Merge "[DO NOT MERGE] Make sure smartspace connects when added" into sc-v2-dev