Merge "Device Control metrics" into sc-dev