Merge "Update desktop icon/app Chip with the new icon" into main