Merge "Fixes incorrect delete on app update"