mboxlist: refactor upgrade_subs work to re-check key under the user lock

This means that we don't try to repeat the work if another process already
did it.