This is the thread avatar version of D8363.
After removing all of the platform-specific stuff from updateImageThreadAvatar and baseSetThreadAvatar, there was one line different between them. Seemed simpler to handle w/ a conditional than two separate functions.