Make non-portable tor-browser compatible with existing tor-launcher functionality

We've made good progress around support non-portable firefox profile in #20497 (closed) but work still needs to be done around supporting system tor and launching own tor in non-portable mode.