Merge "sf: Rename app buffer count property"