Merge changes Ib9d8df90,I15c693c2

* changes:
  Send multiple scheduler frame timelines (fix).
  Revert "Revert "Send multiple scheduler frame timelines.""