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

* commit 'e0ec2a956840fa70387883f422b6020c1dfc6bad':
  Fix ES2 composition on some devices