Merge "Cleanup flag "warning_use_default_dialog_type"" into main