Merge "Remove frictionIconColor attribute"