Merge "DeviceConfig: Add Name space and keys for Display Manager"