Merge "Reduce dropped event logging in dispatcher" into main