Merge "Fix ProfileSelectDialogTest" into main