Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1