Merge "make round icon usage configurable" into nyc-mr1-dev