More changes to DeviceController and SessionAttributes.