am e2ff529b: Merge "b/3377597 Improve zooming performance." into honeycomb

* commit 'e2ff529b3f69a3d2ccd55e283f3d0e446a087ed6':
  b/3377597 Improve zooming performance.