Merge change I01b36924 into eclair-mr2

* changes:
  click OK to toggle between demos