Merge "Check SpriteIcon validity before drawing" into main