Merge "Fix overlapped badge in profile icons" into main