Merge "hwc2: Modify the Config Count"