Merge "hwc: always enable BWC for primary"