Merge "Fix bug with resize frame disappearing." into sc-dev