Merge "Don't let ScrollView intercept touch events if it can't scroll." into jb-mr1-dev