Merge "Fix scrolling bug with directory header when loading new tab" into rvc-dev am: 69be2f28bc am: a40a5382c9

Change-Id: Ifaf16a7f57497b0df166bbc960368b457ee8fe66