Merge "Fix artifact with clipped webview content" into honeycomb