Merge "Make device_config clear_override take effect immediately." into main