Merge "Fix clipping while scrolling" into rvc-dev