Common: Fix compile warning, factor out a function
stereo tools: More reshuffling for multi-view