Merge "Respect Drawable's alpha when drawing UserBadgeDrawable's background" into main