Merge "Enable new_shade_carrier_group_mobile_icons For Droidfood" into main