Merge "hwc: Rename two app buffer property."