Merge "Update resolver icon generation"