Merge "Fix empty side stage after dropping foreground app icon to split" into sc-v2-dev