Merge "Make sure service handles are live before passing to other objects." into gingerbread