Merge "[DO NOT MERGE] Smartspace - Don't create session ahead of init" into sc-qpr1-dev