Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1