Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread