Merge "Make DESTROY_CONTENT_ON_REMOVAL default VDM flag." into main