Merge "Don't set fastScrollAlwaysVisible to true"