am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

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