Merge "Add +/- buttons to expand/collapse warning categories."