Bug 1055424 - migrate when new key is used in system
Merge pull request #23139 from gasolin/issue-1055424-2

Bug 1055424 - migrate when new key is used in system, r=alive,arthur