Merge "AppCompat override no longer applies for WebView Zygote" into main