Merge "adding the icon attr to CarNavigationButton"