Merge "Change clearEvents() to clear existing events rather than setting mEvents to null to remove possible NPE." into sc-dev