Merge "b/3377597 Improve zooming performance." into honeycomb