Merge "Limit dragging using 2 pointers so that it doesn't create a clunky...

Merge "Limit dragging using 2 pointers so that it doesn't create a clunky behaviour when the user uses 2 fingers to resize at once or sequentalliy." into main