Merge "Update OWNERS order and add component" into main