Merge "DO NOT MERGE - Don't crash uninstalling updates to system apps" into lmp-preview-dev