Merge "Force redraw in touch_up if there is a move." into froyo