This commit fixes the issue where the user avatar was not being colored (using only the gray one) when the device was rotated. Additionally, it fixes a race condition issue of the avatar color sometimes being different than the selected one. Bug: 261035066 Test: manually tested && atest UserSettingsComponentTest Change-Id: I739fa8fd5d8717b602d7ba561d9c728ce622ff10