Merge "Do not calculate drag area with no valid display context." into main