Merge "Fix issue where the dnd mode remains on after a call terminates." into nyc-mr2-dev