Merge "add partition system_ext back" into main