Merge "Adding is_emergency field into the incoming_sms" into main