am ec7bd328: am a76b37e1: am 265df035: 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 'ec7bd32888bba6216c84ce6ae8d29ef9a2a94ee8':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]