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

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