Merge "Fix ES2 composition on some devices" into klp-dev