Merge "[flexiglass] Fix multiple smartspace view issue." into udc-qpr-dev