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

Change-Id: Ic637eb6d71551a974557577aea1487b4bd75c5a9