Merge "Add adaptive dogfood icon and fix the icon background color" into oc-dev