Merge "[Path usage Unification] Widget Uninstallation part unification"