Currently when I add a new device to an existing activity via the wizard, all of my existing button mappings get reset. If I try to back out before the last step of the wizard, the new device gets removed. I'd really prefer not to re-do everything, is it possible? I am on app version 0.9.971 with firmware 4.13.8

I agree. This is frustrating. Sometimes there are multiple devices that sorta work.. but I need to change to a different one because it's missing a mapping. I have to re-do every custom thing I did when swapping that out. I understand if you need to remove the previous device that I changed from.. but resetting everything doesn't seem right.