Merge "Keep the TP-MessageRef as is for SMS Fallback" into main