Merge "Fixes incorrect system app deletion logic"