Merge "Remove extra settings write on package replace"