Merge "Fix the allowed icon type error message" into nyc-mr1-dev