Merge "Change application launcher icons to adaptive icons b/35429795" into ub-launcher3-dorval