Merge "Simplifying icon normalization for adaptive icons" into main