am cb52ff3a: (-s ours) am efc7ec99: am cc5e933f: am 5c7a844c: (-s ours) am 23726255: am 77d1eca7: am 7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit 'cb52ff3ad45569f99467d572f9c685bc4dd9a858':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]