Merge "b/3331379 reduce ping-to-zoom jitter." into honeycomb