I don't really like the singleton either (as you might have guessed?) but I feel less strongly about this... I do think it makes sense to start with a shim in one app only and then move from there... I would like to try this out elsewhere but the concerns I have in Calendar (or elsewhere) are more complex then the current shim for settings.

@fabi1cazenave kaze do you have some thoughts here?