am 11c87237: am 663a1c74: am 9e0593fb: (-s ours) am 513bf25d: am 5b42e1ae: 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 '11c87237ecb681353eec756fff9504ac235dbe25':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]