Merge "Fix the restriction of odm partition overlays" into main