Merge "Fix calculation of areChannelsBypassingDnd" into udc-qpr-dev