Merge "Add test for UserBadgeDrawable alpha handling" into main