Merge "[flexiglass] Fix multiple smartspace view issue." into main