Correct retry logic for SMS JB+ and for push groups.