I think you can get away with not worrying about the change detection mechanism because where you've put the call should be fine. Save/cancel buttons are already being dealt with. I would say to merge this with the other branch after strings.xml usage is fixed, but I don't think it will work because that branch is behind, and I *think* the Uri functions aren't all there.

It'd be silly to change things to get it to work with an outdated branch, only to revert it when the branch gets merged back in, so I'd say this can get merged to master as is, once that branch gets merged back and this patch set is updated (to get the patch offsets righ :) ). I think merging it in now would annoy people, as they would save their keyrings with no changes, and upload it - they could do this many times without changing anything, but have lots of changes uploaded - meaning everyone has to download pointless updates of your key etc... better to wait until an upload is actually needed and offer it then, if that makes sense!