Merge "Fix a bug that could cause padded lists to draw dividers incorrectly"