Merge "Add support for action buttons without an icon."