Merge "Include additional logging to debug shortcut restore issues" into main