Merge "Split RCS events into API and internal classes"