Merge "Don't time out device listener service connections" into sc-dev