Merge "Get rid of TunnelRenderer" into jb-mr2-dev