Allow setting of independent Person and Device custom data
[Fixes #53260135] [Fixes IOS-148]