Merge "Fix SimDialogActivityTest" into main