Merge "RoamingDialog stays open on rotation" am: ef15cc6c80 am: 13ef6252fd
am: 87e810532f  -s ours

Change-Id: I055d9c4cac80755384206378f3ca94ac08da8737