Cache extra for on demand choice
Check WebView type (support info)
Safety checks
Merge remote-tracking branch 'upstream/master'