Merge "Remove call to setPadding() in setUseDefaultMargins()."