Merge "Update test for smartspace disconnect" into sc-v2-dev