Merge "Check key before edit value in countFlushCompleteEventsLocked" into oc-dr1-dev