Merge changes I83ca5092,Ib554f5aa into main

* changes:
  Enable flag overlay_dynamic_parititions only
  Don't use heuristics to pick volumes to overlay