Merge "Simplify viewport logic in webviewcore and zoom-manager."