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

Change-Id: Ia8de48fd90562c8d6e3cbb076aea814370b4c655