Merge "Add new fields for counting sms sms message for Satellite" into main