Merge "Only shows roaming disconnect notificaiton once" into oc-dev