Merge changes I34af02d4,Ifc222d84,I74c8cffa into main

* changes:
  SF: Apply color matrix to newly connected displays
  SF: Extract CommitAndCompositeTest helper
  SF: Replace futureOf with ftl::yield in tests