Merge "Use renamed restricted icon size config-value"