Merge "HistoryAction: Use correct classes for buttons"