Merge "Add Activity methods for icons and labels."