Merge "Remove nested scrolling" into rvc-dev