Merge changes I2b89dce1,I5412eae0,I2e428ec1 into pi-dev

* changes:
  EGL: Fix over zealous colorspace implementation
  SF: Update to composer@2.2 implementation
  EGL: Plumb HDR metadata