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

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