Merge "Merge "Fix for WebView not drawing in a layer" into rvc-dev am: 70a24c32 am: b5753580 am: c52eca8a" into rvc-qpr-dev-plus-aosp