Merge "Change shortcut choser dialog to be more explicit" into main