Merge "Rename single buffer mode to shared buffer mode" into nyc-dev
am: 0e28c1f

* commit '0e28c1fa4a759755f21bf8a10d9e645ae64d1f78':
  Rename single buffer mode to shared buffer mode