Merge "prevent DscpPolicyTracker from printing big scary exception stack" into main