Merge "[flexiglass] Separates smartspace view from view-model" into main