Merge "drm_hwcomposer: Clean up error conditions"