Merge "Rename single buffer mode to shared buffer mode" into nyc-dev