Merge "Prevent NPE when dropping app icon to split" into sc-v2-dev