cherry-pick error fix for "add overscroll setting"