Merge "Remove "Device Controls" from Settings" into sc-dev