Merge "Handle failed supplmentary service notifications"