am cf2b65ce: am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev

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