Support7Demos: Enable the route discovery action only when needed
am: 813d715

* commit '813d715270d1e19a552888e6fd0add094882937a':
  Support7Demos: Enable the route discovery action only when needed