Allow merging accounts from different platforms

[bigpopakap]

For apps that want data shared across platforms, we need a way to merge two user accounts into one. For the generic case, some assistants may require that accounts are merged up front