Merge "Allow badging with ComponentNames" into sc-dev