Merge "Adding additional logging around updated shortcuts" into main