Merge "Catch ServiceSpecificExceptions properly when getting reg state/ transport type" into sc-dev