fix/revert/modify changes from 13617 that hide the gain + peak display from a generic...