Merge "Fix scroll down behavior" into rvc-qpr-dev