Merge "Fix SMS status handling"