Merge "Update ordering of shortcut helper system shortcuts." into main