Merge "Improve shortcut backup & restore."