Change inspired by 691107263c

Fix a regression introduced by 612b00d1bb

This prepares for a third option that would restrict privacy to
privacyPreference(replyPrivacy, sideArmBasePrivacy)

Port 86efccce2a to glitch-soc

Port 53c2164e9c to glitch-soc

Port d1f34151ae to glitch-soc

Port 6a895e1ab3 to glitch-soc

Ports cfa9b6e13a to glitchsoc

This is a backport of b6af88192f to the glitch flavour.