DP-2558 Save device_id after activate. Unless user set device id it wont change