Merge change 9611 into donut

* changes:
  Fix regressions in source mixing logic by going back to previous approach with a longer promoted source timeout.