My Site Dashboard: Updated Avatar not shown on app relaunch

Expected behavior

Avatar maintains updated photo after swipe-off/relaunch sequence

Actual behavior

From @ParaskP7 in PR #15554
I tested the solution thoroughly and what I discover is that there exist a bug with the previous, and of course, the current implementation of CurrentAvatarSource. When you initially update the avatar it is uploaded okay. However, when you update it again, it no longer updates. It seems to be updating, you will see the change indeed, but if you swipe-off and relaunch the app, not just backgrounding and foregrounding it, then you will notice that the avatar hasn't been updated. To recover from that state one would need to log-out and log-in again. Also, it seems that any update it taking about 2-3' mins to actually take effect. That is if you check the web, you will notice that the avatar is not updated instantly, you will have to wait a bit.

Steps to reproduce the behavior

I captured a recoding below:

https://user-images.githubusercontent.com/9729923/141289577-032dd375-6475-447b-bfdb-916321164ceb.mp4

Tested on [device], Android [version], WPAndroid [version]

Emulator

Start by reviewing the CurrentAvatarSource implementation and PR #15554, then reproduce the avatar update, swipe-off, and relaunch sequence described in the issue. Trace why a second avatar update is not retained after relaunch and verify that repeated updates persist without requiring logout and login.