Merge "Fix scrolling bug with directory header when loading new tab" into rvc-dev