Merge "Modify the condition for hide Dds confirmed dialog" into main