Merge "Only shows roaming disconnect notificaiton once" into oc-dev am: e08a5a3184
am: 72c7d2b7cd

Change-Id: Ica432311e886d81e7a7b0ddaa79e20a63ceb31bf