OOIION-1396: Device state persistence