Merge "[DO NOT MERGE] Support multiple smartspace views" into sc-v2-dev