Merge "[DO NOT MERGE] Smartspace - Don't connect until setup" into sc-qpr1-dev