am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1

* commit '43bc6b094edda6baa8123115a33afaf454525376':
  Fix updateDoubleTapZoom logic