Merge changes I9d880122,I138795d4 into main

* changes:
  [flexiglass] Scene class hierarchy changes
  [flexiglass] Structured concurrency fixes