Merge "Fix missing break in Icon class" into mnc-dev