Merge "RoamingDialog stays open on rotation" am: ef15cc6c80
am: 13ef6252fd

Change-Id: I76f4643ced114edd6ca3e923fb21e99c4d09bb6c