Merge "Fix initial FastScroller enabled state, fix padding during layout"