Merge "ShortcutService log clean up." into main