Merge "Fix updateDoubleTapZoom logic" into ics-mr1