Merge "Fix IllegalArguemntException for ClipIconView#update" into main