Going forward always write to ControlFile for User & sentry app avatars.
This helps make application logic more consistent going forwards as
new avatars are always stored in ControlFile. I've retained read paths
for `File` backed avatars so that we preserve behavior in both
single-tenant and self-hosted. We also retain the ability to write to
a control silo specific storage bucket should an environment be
configured in that way.