Merge "hwc: Remove getNonWormHoleRegion optimization for primary"