Merge "Prioritize System shortcuts over shortcut services" into main