#21126 - updated to use latest core implementation of show_dialog/modal