Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread