Improved support for unplugging and plugging controllers back in.