Merge change 2897 into donut

* changes:
  fix 1650170 pixelflinger depends on KeyedVector.h, etc