Merge "Only shows roaming disconnect notificaiton once"
am: da9efe4693

Change-Id: I40c587ff4336b83a03110b7a734d581e2f26ef9b