I am suggesting both

So, GrapheneOS should have a function that replaces the content of the phone with a vanilla set of apps and a clean account, instead of wiping it, on receiving the distress code.

Are you churning out features faster though? Looks like that’s the only thing that matters. Apparently customers yearn for new stuff every day (hint: usually they don’t).