Merge commit '8d4baa789302b2c0f2657af9ba6dc98fcc926ee2' * commit '8d4baa789302b2c0f2657af9ba6dc98fcc926ee2': If ZoomButttonsController detects more than one pointer,
Merge commit '8d4baa789302b2c0f2657af9ba6dc98fcc926ee2' * commit '8d4baa789302b2c0f2657af9ba6dc98fcc926ee2': If ZoomButttonsController detects more than one pointer,