Merge "Reduce margin for DropTargetBar to avoid buttons to be truncated." into sc-dev