Merge "Fix WebView disappearing" into nyc-dev