Merge "Always draw a background for the user avatar" into sc-dev