After removing all the platform-specific stuff from `baseUpdateImageUserAvatar` and `baseSetUserAvatar`, there was one line different between them. Seemed simpler to handle with a conditional than two separate functions. The less code the better?
---
Depends on D834860