Merge "Always swap buffers if using partial update extension" into nyc-dev am: a24b5d4811
am: 89e95934e8

* commit '89e95934e8f1a50adefcd90d42d365605951833e':
  Always swap buffers if using partial update extension