Merge "Solve rendering issue with embedded WebViews. Bug #3094017"