Double-tap when zoomed now zooms out to the default zoom.

Double-tapping to zoom in will pad the zoom origin if it would cause the
resulting image to not fill the view and be off-center.
Change-Id: Ie4e666db9b1aedd8bf840cb6de08e78d06e179da
Merge "Double-tap when zoomed now zooms out to the default zoom."