Merge change 24507 into eclair

* changes:
  Add double tap to zoom.