Merge "Generalizing the PredicitonScroll view so that in can be used in all-apps" into tm-qpr-dev