am da954bb5: Merge "Fixing issue where shortcuts and widgets were not being removed when the package was uninstalled (Bug 2657997, Bug 6335843)" into jb-dev

* commit 'da954bb59932db33e50faf50ebbef77b8b458833':
  Fixing issue where shortcuts and widgets were not being removed when the package was uninstalled (Bug 2657997, Bug 6335843)