Merge "Disable failing tests in ShortcutService" into main