Addressed separately here: https://github.com/ros-visualization/rviz/commit/fd4a12e72614c9a2f4234bc590fd85ad9cd71d5b