Merge "Always swap buffers if using partial update extension" into nyc-dev