am 7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]

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