Closes Additional Software data is not fully copied to... (#18839 - closed), Tor Bridges persistence sometimes fails to save... (#18926 - closed)