[Ag20] Some of the close buttons do not work in modal dialog

[xingzhang-suse]

Maybe the implementation logic has some difference, some of the close buttons cannot close the modal dialog.

NG:

OK:

Please figure out the difference and use the correct approach to make all the buttons work.