Merge "Update OWNERS order" into main