Merge changes from topics "b_208879711", "hwc_present_time"

* changes:
  SF: DisplayCommand.colorTransform is just a matrix
  SF: pass expectedPresentTime to composer