Merge "Revert "m3: Refine AlertDialog style"" into main