Merge "Rename EVENT_DISPLAY_SOS_MESSAGE" into main