Merge "Updating the scroll calculation from recyclerView to avoid view inflation" into tm-qpr-dev