Merge "Add drm hwc support"