Merge "Fix black screen when drag divider to bottom" into sc-v2-dev