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 'd7cc4bf482d69d146eb5386b790816c8a46f278a':
  DO NOT MERGE Quick fix for updating the FastScroller long list property