Merge "Only start nested scrolling if the view is large enough" into lmp-mr1-ub-dev