Merge "Update behavior of "global" DND APIs" into main