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