Merge "Fix IllegalArgumentException for Float.NaN in ClipIconView."