Merge "RoamingDialog stays open on rotation"