Merge "Change CDM device presence scan mode"