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

* commit '6d3e51d4c453b43b1f1950884c3d08c285d2ce90':
  Fix updateDoubleTapZoom logic