Merge "Deprecate Intent based installation/uninstallation"