Merge "Remove connected device check logic in getConnectionState"