Merge "Fix monkey bugs in ListView" into klp-dev