cherry-pick error fix for "add scroll settings"