DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am: abb54d6d36 am: 6e9165b908  -s ours am: 44c3652b4c am: 5a1ae16f4e am: d59eb61a3e  -s ours am: d6e1fa7c20
am: 44853bf994

* commit '44853bf9949725ba84c30cb40dc2f99f8b701a70':
  DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue