Merge "Additional debug logging to triage shortcut related issue." into sc-dev