Merge "Enable singleDevice for CDM UI"