am 7ef9b612: Merge "Fix monkey bugs in ListView" into klp-dev

* commit '7ef9b612412a2169c8c0e0b3506b06516cb012b5':
  Fix monkey bugs in ListView