Merge "[IMPROVE FILL DIALOG] Setup DeviceConfig flags" into main