Merge "Correctly mark layers dirty when drawing WebView."