Merge "[Settings] Update PIP with new Settings integration" into main