am 70994e9e: (-s ours) am d7cc4bf4: am cf2b65ce: am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev

* commit '70994e9eef43b6cf95ec6cf553dd97bf92567587':
  DO NOT MERGE Quick fix for updating the FastScroller long list property