Merge "Updates in CDM dialogs for VDM screen mirroring" into main