Merge "Fix black screen while pip to split screen" into sc-dev