Merge "Tweaks for webview snap"