re-conditionalize sonar enabling, and add conditionalization of sonar tfs' timers