Merge changes I4ee2affc,I81577500

* changes:
  Fix uninstall/disable with multi-user compressed stubs
  Refactor PackageSetting codePath and remove resourcePath