Merge "Fix for WebView not drawing in a layer" into rvc-dev