Merge "Temporary workaround for webview render delay" into nougat-cts-dev