Merge "Fix drag-to-open forwarding behavior"