Merge "Fix logic for whether beginning/end divider should be drawn" into mnc-dev