Merge "Make registrationState consistent with RoamType in case of override"