Merge "Update Settings OWNERS file" into main