When that branch gets merged into STJr, first merge their master to your branch. Afterwards, the diff in this PR should be condensed to just the console command stuff.
The conflict between my branch and yours is straightforward -- just needed to change RestartAudio to the adjusted code.
(I did not add if (dedicated) return; to this merge, ignore that line.)
