Merge "Fix drag-to-dismiss split screen crash with shell transition"