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

Change-Id: I192c73407aaa9f1033a71c013514cde85154fda3