Improved handling of inactive network service state

Bnc878719