am dcd99113: merge in klp-release (no-op)

* commit 'dcd9911315bc6864b61d1d76ca0ff3904227889b':
  Do not assume WebView is running on the main thread.