Merge "Clean component settings while updating an app" into main