Merge "Write Icon to proto" into main