Merge "RoamingDialog stays open on rotation"
am: ef15cc6c80

Change-Id: I3d743192eac9623245a5e91ce1c742e67491f71d