Merge "Dispatch cancel event to the correct target display" into main