Merge "Fix 3444233: No edge glow when dragging to adjacent screen"