Merge "Add more DND state logging for debugging" into main