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

* commit '9206d6a0e69ef0f60e20464796d4a2da6f7c42f4':
  Fix logic for whether beginning/end divider should be drawn