Merge "Revert "Do not use DeviceConfig.getAllProperties()."" into main