Merge "Fix hidden EmptyShadeView" into sc-dev