am 112c72a9: Merge "Get rid of TunnelRenderer" into jb-mr2-dev

* commit '112c72a9655c0d2fa3a8058e2a6c3bef6adb6232':
  Get rid of TunnelRenderer