Merge "Try to keep connection state more up to date" into mnc-dev