Merge "Use DeviceConfig flag instead of aconfig flag" into main