Merge "Don't auto scroll empty lists"