Merge "Fix to show the network selection no service notification" into oc-dev