Merge "Updating StatusBar people avatar sources" into rvc-dev