Merge "Fix 3385675: Uninstall option available for system app"