Merge "fix scrolling bug upon pinch-zoom" into gingerbread