Merge "b/3350774 avoid screen jumping when pinching to zoom." into honeycomb