Update offered to device, but only applied if accepted

Another user asked a very similar question #4590