Merge "Remove isHighEndGfx check" into oc-mr1-dev