Merge "Fix unexpected selection cancellation"