[master] Quick fix for rviz; Also switched off smach viewer