Snapshot mode now uses secondary image if enabled for picture output