Merge "Add null-pointer check for the case where we have no WebView provider."