Merge "Update scroll up and down behavior" into rvc-qpr-dev