Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-dev