Merge "Modify the condition for showing DSDS dialog" into main