Merge "hwc: Rename app buffer count property"