Fix HWC for s2ve/s2vep