Merge "Add feature flag for HWC2"