Merge "Fix issue where pm would clear preferred apps when updating an app."