am 4e1afc1a: Merge change 2361 into donut

Merge commit '4e1afc1a'

* commit '4e1afc1a':
  Fixes #1872506. Prevents NPE in ListView. When the opaque property changes at runtime, it is possible to end up in a situation in which the divider's Paint instance has not been instanciated. This change simples uses a final Paint that is guaranteed to not be null.