Merge "hwc: Featurize framework changes"