[2.0.x] Fixed #29286 -- Fixed column mismatch crash with QuerySet.values() or values_list() after combining an annotated and unannotated queryset with union(), difference(), or intersection().

Regression in a0c03c62.

Thanks Tim Graham and Carlton Gibson for reviews.
Backport of 0b66c3b4 from master