Merge "Settings: Fix queryShortcuts_shouldSortBasedOnPriority test" into main