Merge "Fix Drag to launch desktop still shows app chip" into main