Merge "Improve TransportController demo." into jb-mr2-dev