Merge "Warn that reboot might be needed after setting IDs" into main