Merge "Remove usage of DELETE_SHOW_DIALOG flag" into main