Merge "Move the "IntFlag:" dump under "DeviceFlag:" section" into main