Merge "Make SystemUIDialogTest deviceless" into main