Merge "Use correct columns for RCS_UNIFIED_EVENTS_VIEW"