Merge "Add namespace to `sDeviceConfigAconfigScopes`." into main