Merge changes I4e0bac46,I86f92508

* changes:
  Marks resolved webview provider as visible
  Make PackageManagerInternal#getPackageUid internal