Merge change 11093

* changes:
  If FLAGS_2D_PROJECTION is set, the MVP matrices need updating when changing the viewport.