Merge "Only shows roaming disconnect notificaiton once" am: da9efe4693 am: f9ccea2068
am: 222d98e889  -s ours

Change-Id: Id8d96e90c892638c5864cb97ecd56516fd5b6c28