UIUpdates and webview
Merging upstream changes